Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 28 Jan 2011 00:32:35 +0000 (16:32 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 28 Jan 2011 00:32:35 +0000 (16:32 -0800)

Trivial merge